This is based off of the change submitted in #9338 but modifies the change in the daemon.rb to not pass in the Service_Main as an argument but to just access it directly.

jenkins please test this on windows2012r2-64a,windows10ent-32a

Backport failed for 7.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin 7.x
git worktree add -d .worktree/backport-9386-to-7.x origin/7.x
cd .worktree/backport-9386-to-7.x
git checkout -b backport-9386-to-7.x
ancref=$(git merge-base 0c28d4f6f5aec1d6fd8c460528381d4e6e678c20 d6386ac3698aa665bf6fcec1c158f7840ff6b8d1)
git cherry-pick -x $ancref..d6386ac3698aa665bf6fcec1c158f7840ff6b8d1